From 98dd0f945625d0c5469f8b840c8fb83c961523eb Mon Sep 17 00:00:00 2001 From: Debian LibreOffice Maintainers Date: Sat, 27 Jan 2024 13:25:02 +0000 Subject: [PATCH] debian-hardened-buildflags-CPPFLAGS Gbp-Pq: Name debian-hardened-buildflags-CPPFLAGS.diff --- config_host.mk.in | 1 + configure.ac | Bin 552009 -> 552149 bytes solenv/gbuild/gbuild.mk | 2 ++ 3 files changed, 3 insertions(+) diff --git a/config_host.mk.in b/config_host.mk.in index b315d40af53..1d318c9e0a9 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -98,6 +98,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@ export CPUNAME=@CPUNAME@ export CDEFAULTOPT=@CDEFAULTOPT@ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@ export CROSS_COMPILING=@CROSS_COMPILING@ export CURL=@CURL@ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@ diff --git a/configure.ac b/configure.ac index 49724c646d80b6397a2d4f096ab4bbd3ef704d7c..90c1caa91f221aef5ab87b4387399e4745fd6fa9 100644 GIT binary patch delta 170 zcmX?kL-FcO#fBEf7N!>F7M2#)Eo>W>)MutCl%y7yDCkxw=$953=_h68>8BKAr|Tw_ zX6B@%ucK!As1kc+EdymLT+n~$S=ux$dGY6V^0^wbgsn7o3KoqkGc onSNerPEG<>S|*pHb9`{9Q*ej|*dQ*1N$qQwux($vgniC&0GIDMbN~PV delta 36 scmcb5Q}N^t#fBEf7N!>F7M2#)Eo>W>On+d=A>AInlx=(XQueyz03OQ^761SM diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index f14e9f1a1ed..c1b95a69bea 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -272,6 +272,8 @@ gb_GLOBALDEFS += \ DISABLE_DYNLOADING \ ) +gb_GLOBALDEFS += $(HARDEN_CPPFLAGS) + gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS)) # Common environment variables passed into all gb_*Test classes: -- 2.30.2